Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 11 Jul 2011 06:05:57 +0000 (23:05 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 11 Jul 2011 06:05:57 +0000 (23:05 -0700)
commita9df536e890f2f96ceae5bd66033e068c0b81758
treea88a49c017bca48aa7a49913b761fccc1216beb4
parent2bec399e7d4ad048f62f4acd5eef9e86a3c0645e
parentb8aff49f994759bded9c8f832658eb80dea85c5f
Merge from trunk.
15 files changed:
ChangeLog
lib-src/ChangeLog
lib-src/update-game-score.c
src/ChangeLog
src/alloc.c
src/buffer.c
src/data.c
src/dispnew.c
src/emacs.c
src/floatfns.c
src/image.c
src/lread.c
src/regex.c
src/sysdep.c
src/xdisp.c